Add RBAC for rss feeds #14041

lpichler · 2017-02-23T13:50:16Z

First part for https://bugzilla.redhat.com/show_bug.cgi?id=1418961

Add RBAC for rss feed
fix order clause for rss in yaml - I added table to avoid ambiguousness in query where is table in :includes (this solution is choosen instead of [WIP] Fix rbac for string in order clause #14001)
we have 2 yamls for RSS but only in one is orderby clause which is causing errors.

Links [Optional]

https://bugzilla.redhat.com/show_bug.cgi?id=1418961

@miq-bot assign @gtanzillo
@miq-bot add_label bug, core

chessbyte · 2017-02-23T14:41:37Z

app/models/rss_feed.rb

+ rbac_options = {}
+ if user_or_group
+ user_or_group_key = user_or_group.kind_of?(User) ? :user : :miq_group
+ rbac_options = {user_or_group_key => user_or_group}


I think rbac_options[user_or_group_key] = user_or_group is clearer

sure 👍, changed, thanks

kbrock

very nice Libor

kbrock · 2017-02-23T18:24:53Z

spec/models/rss_feed/data/newest_vms.yml

@@ -27,7 +27,7 @@ item_class: Vm
 search_method:
 limit_to_time:
 limit_to_count:
-orderby: "created_on DESC"
+orderby: "vms.created_on DESC"


kbrock · 2017-02-23T18:26:03Z

app/models/miq_widget/rss_content.rb

@@ -9,22 +9,22 @@ def external?
 resource.nil?
 end

- def generate(_user_or_group)
+ def generate(user_or_group)


very nice touch. this flowed through very smoothly

kbrock · 2017-02-23T18:28:43Z

kicking

kbrock · 2017-02-23T18:54:25Z

@lpichler I want to merge, but that failure looks like it is not going away

kbrock · 2017-02-27T14:30:02Z

spec/models/miq_widget/import_from_hash_spec.rb

@@ -127,6 +127,9 @@
 context "with new rss feed" do
 it "init status" do
 expect(MiqWidget.count).to eq(1)
+ puts RssFeed.class
+ puts RssFeed.methods.inspect
+ puts RssFeed.ancestors.inspect


I'm assuming these are in here for debugging?

kbrock · 2017-02-27T14:31:46Z

spec/models/rss_feed/rss_feed_spec.rb

- @host2 = FactoryGirl.create(:host_microsoft, :created_on => @host1.created_on + 1.second)
- end
-
- it "#generate 2 hosts in newest_hosts rss" do


is this already covered by other tests?

just experimenting :/

I don't know what is happening here and why RssFeed is not model here https://travis-ci.org/ManageIQ/manageiq/jobs/205791463#L527 and I think that I did not make related change.

locally it is ActiveRecord

to be able use it for RBAC

and process user or group as parameter for RBAC

otherwise it leads to error ambiguous column when RBAC was added.

lpichler · 2017-03-02T10:15:04Z

@kbrock this needed to be merged first (resolution of sporadic failure)

miq-bot · 2017-03-02T10:17:15Z

Checked commits lpichler/manageiq@e31e658~...74351e9 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
3 files checked, 0 offenses detected
Everything looks good. 🍪

lpichler · 2017-03-03T09:29:57Z

@miq-bot remove_label wip

This PR is ready.

Add RBAC for rss feeds (cherry picked from commit 6eea127) https://bugzilla.redhat.com/show_bug.cgi?id=1431168

simaishi · 2017-03-10T14:32:44Z

Euwe backport details:

$ git log -1
commit 33a86fa1bdd848d86c60599a45d180d28489e201
Author: Keenan Brock <keenan@thebrocks.net>
Date:   Fri Mar 3 14:36:55 2017 -0500

    Merge pull request #14041 from lpichler/add_rbac_for_rss_feed
    
    Add RBAC for rss feeds
    (cherry picked from commit 6eea12732de8a704a75d21040476e81597d0dccf)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1431168

simaishi · 2017-03-14T18:37:25Z

Backported to Darga via #14308

Add RBAC for rss feeds (cherry picked from commit 6eea127) https://bugzilla.redhat.com/show_bug.cgi?id=1431168

miq-bot assigned gtanzillo Feb 23, 2017

lpichler mentioned this pull request Feb 23, 2017

[WIP] Fix rbac for string in order clause #14001

Closed

lpichler force-pushed the add_rbac_for_rss_feed branch from bc3af1e to 4a9c1f6 Compare February 23, 2017 14:08

chessbyte reviewed Feb 23, 2017

View reviewed changes

chessbyte added enhancement core/rbac labels Feb 23, 2017

lpichler force-pushed the add_rbac_for_rss_feed branch 3 times, most recently from 0326507 to 40ffd2c Compare February 23, 2017 15:55

kbrock approved these changes Feb 23, 2017

View reviewed changes

kbrock assigned kbrock and unassigned gtanzillo Feb 23, 2017

kbrock added this to the Sprint 55 Ending Feb 27, 2017 milestone Feb 23, 2017

kbrock closed this Feb 23, 2017

kbrock reopened this Feb 23, 2017

kbrock modified the milestones: Roadmap, Sprint 55 Ending Feb 27, 2017 Feb 23, 2017

lpichler force-pushed the add_rbac_for_rss_feed branch from 40ffd2c to a1a3778 Compare February 27, 2017 12:12

kbrock reviewed Feb 27, 2017

View reviewed changes

kbrock changed the title ~~Add RBAC for rss feeds~~ [WIP] Add RBAC for rss feeds Feb 27, 2017

kbrock added the wip label Feb 27, 2017

lpichler closed this Feb 27, 2017

lpichler force-pushed the add_rbac_for_rss_feed branch from 6dd891b to f31d512 Compare February 27, 2017 15:07

lpichler reopened this Feb 27, 2017

lpichler force-pushed the add_rbac_for_rss_feed branch from 1ff65b9 to 5b6abac Compare February 27, 2017 15:45

lpichler mentioned this pull request Feb 27, 2017

[WIP] Add rbac for rss feed copy #14083

Closed

lpichler closed this Feb 27, 2017

lpichler force-pushed the add_rbac_for_rss_feed branch 3 times, most recently from 5e2fe0b to 25a687e Compare March 1, 2017 17:58

lpichler mentioned this pull request Mar 2, 2017

Sort files to require for coverage reports #14128

Merged

lpichler added 4 commits March 2, 2017 11:12

Pass user or group to the rss generator

e31e658

to be able use it for RBAC

Add RBAC call for items in RSS Feed

6c7b6bd

and process user or group as parameter for RBAC

Add spec for RSS feed generation

ab55c57

Fix order clause to determine order column from concrete table

74351e9

otherwise it leads to error ambiguous column when RBAC was added.

lpichler force-pushed the add_rbac_for_rss_feed branch from 25a687e to 74351e9 Compare March 2, 2017 10:12

lpichler mentioned this pull request Mar 2, 2017

Add tenant scoping for resources of performance reports in RBAC #14095

Merged

lpichler changed the title ~~[WIP] Add RBAC for rss feeds~~ Add RBAC for rss feeds Mar 3, 2017

miq-bot removed the wip label Mar 3, 2017

kbrock modified the milestones: Sprint 56 Ending Mar 13, 2017, Roadmap Mar 3, 2017

kbrock merged commit 6eea127 into ManageIQ:master Mar 3, 2017

lpichler deleted the add_rbac_for_rss_feed branch March 6, 2017 08:45

gtanzillo added the euwe/yes label Mar 10, 2017

simaishi pushed a commit that referenced this pull request Mar 10, 2017

Merge pull request #14041 from lpichler/add_rbac_for_rss_feed

33a86fa

Add RBAC for rss feeds (cherry picked from commit 6eea127) https://bugzilla.redhat.com/show_bug.cgi?id=1431168

simaishi added euwe/backported and removed euwe/yes labels Mar 10, 2017

lpichler mentioned this pull request Mar 13, 2017

[DARGA] Add RBAC for rss feeds and #14316 #14308

Merged

simaishi added the darga/yes label Mar 14, 2017

simaishi added darga/backported and removed darga/yes labels Mar 14, 2017

agrare pushed a commit to agrare/manageiq that referenced this pull request Apr 19, 2017

Merge pull request ManageIQ#14041 from lpichler/add_rbac_for_rss_feed

7da6e0f

Add RBAC for rss feeds (cherry picked from commit 6eea127) https://bugzilla.redhat.com/show_bug.cgi?id=1431168

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add RBAC for rss feeds #14041

Add RBAC for rss feeds #14041

lpichler commented Feb 23, 2017 •

edited

Loading

chessbyte Feb 23, 2017

lpichler Feb 23, 2017

kbrock left a comment

kbrock Feb 23, 2017

kbrock Feb 23, 2017

kbrock commented Feb 23, 2017

kbrock commented Feb 23, 2017

kbrock Feb 27, 2017

lpichler Feb 27, 2017

kbrock Feb 27, 2017

lpichler Feb 27, 2017 •

edited

Loading

lpichler commented Mar 2, 2017

miq-bot commented Mar 2, 2017

lpichler commented Mar 3, 2017

simaishi commented Mar 10, 2017

simaishi commented Mar 14, 2017

Add RBAC for rss feeds #14041

Add RBAC for rss feeds #14041

Conversation

lpichler commented Feb 23, 2017 • edited Loading

Links [Optional]

chessbyte Feb 23, 2017

Choose a reason for hiding this comment

lpichler Feb 23, 2017

Choose a reason for hiding this comment

kbrock left a comment

Choose a reason for hiding this comment

kbrock Feb 23, 2017

Choose a reason for hiding this comment

kbrock Feb 23, 2017

Choose a reason for hiding this comment

kbrock commented Feb 23, 2017

kbrock commented Feb 23, 2017

kbrock Feb 27, 2017

Choose a reason for hiding this comment

lpichler Feb 27, 2017

Choose a reason for hiding this comment

kbrock Feb 27, 2017

Choose a reason for hiding this comment

lpichler Feb 27, 2017 • edited Loading

Choose a reason for hiding this comment

lpichler commented Mar 2, 2017

miq-bot commented Mar 2, 2017

lpichler commented Mar 3, 2017

simaishi commented Mar 10, 2017

simaishi commented Mar 14, 2017

lpichler commented Feb 23, 2017 •

edited

Loading

lpichler Feb 27, 2017 •

edited

Loading